diff --git a/package.json b/package.json
index 35b7d9f6..6e7000dc 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
   "name": "js-adagrams",
   "version": "1.0.0",
   "description": "JavaScript version of the Adagrams project",
-  "main": "index.js",
+  "main": "src/adagrams.js",
+  "type" : "commonjs",
   "scripts": {
     "test": "jest",
     "coverage": "open coverage/lcov-report/index.html",
diff --git a/src/adagrams.js b/src/adagrams.js
index 7ec5afc7..d1ae1ab2 100644
--- a/src/adagrams.js
+++ b/src/adagrams.js
@@ -1,15 +1,203 @@
+//import { hasOwnMetadata } from "core-js/fn/reflect";
+
+//import { forEach } from "core-js/core/array";
+
 export const drawLetters = () => {
-  // Implement this method for wave 1
+  const hand = [];
+
+  const letterPool = {
+    A: 9,
+    B: 2,
+    C: 2,
+    D: 4,
+    E: 12,
+    F: 2,
+    G: 3,
+    H: 2,
+    I: 9,
+    J: 1,
+    K: 1,
+    L: 4,
+    M: 2,
+    N: 6,
+    O: 8,
+    P: 2, 
+    Q: 1,
+    R: 6,
+    S: 4,
+    T: 6,
+    U: 4,
+    V: 2,
+    W: 2,
+    X: 1,
+    Y: 2,
+    Z: 1
+  };
+
+  const makePoolArr = function() {
+    const poolArr = [];
+    for (const [letter, quantity] of Object.entries(letterPool)) {
+      for (let i = 0; i < quantity; i++) {
+        poolArr.push(letter);
+      }
+    }
+
+    return poolArr
+  };
+  
+  const getRandNum = function(poolArr) {
+    const maxLength = poolArr.length - 1;
+    const randNum = Math.floor(Math.random() * maxLength);
+    return randNum
+  };
+
+  const poolArr = makePoolArr();
+
+  while(hand.length < 10) {
+    //let letterPoolCopy = letterPool;
+    //const poolArr = makePoolArr();
+    const randNum = getRandNum(poolArr);
+    const letterValue = function () {
+      return poolArr[randNum];
+    }
+      
+    hand.push(letterValue());
+    poolArr.splice(randNum, 1);
+      //letterPool[letterValue()] = (letterPool[letterValue()]) - 1;
+
+  };
+  
+  return hand
 };
 
 export const usesAvailableLetters = (input, lettersInHand) => {
-  // Implement this method for wave 2
+  let validLetterCounter = 0
+  for(let letter of input) {
+      let index = lettersInHand.indexOf(letter);
+      if(lettersInHand.includes(letter)){
+        lettersInHand.splice(index, 1);
+        validLetterCounter += 1
+      } else {
+        return false
+      };
+    };
+  if(input.length === validLetterCounter){
+    return true  
+  };
+
 };
 
 export const scoreWord = (word) => {
-  // Implement this method for wave 3
+  const scoreChart = {
+    "A": 1,
+    "B": 3,
+    "C": 3,
+    "D": 2,
+    "E": 1,
+    "F": 4,
+    "G": 2,
+    "H": 4,
+    "I": 1,
+    "J": 8,
+    "K": 5,
+    "L": 1,
+    "M": 3,
+    "N": 1,
+    "O": 1,
+    "P": 3,
+    "Q": 10,
+    "R": 1,
+    "S": 1,
+    "T": 1,
+    "U": 1,
+    "V": 4,
+    "W": 4,
+    "X": 8,
+    "Y": 4,
+    "Z": 10
+  }
+  // for(let [letter, ptValue] in scoreChart){
+  //   console.log(scoreChart[letter])
+  // };
+
+  let score = 0
+  //console.log(score)
+  //console.log('word:', word)
+  if(word === "") {
+    return score
+  };
+
+  for(let letter of word.toUpperCase()) {
+    //console.log(letter)
+    score += scoreChart[letter];
+    //console.log(score)
+  }
+
+  if(word.length > 6){
+    score += 8;
+  }
+  
+  return score
 };
 
 export const highestScoreFrom = (words) => {
-  // Implement this method for wave 4
+  const wordsAndScores = [];
+  for(let word of words){
+    let wordObj = {
+      "word": word,
+      "score": scoreWord(word)
+    };
+    wordsAndScores.push(wordObj);
+  }
+  //console.log(wordsAndScores);
+
+  const scores = [];
+  for(let wordObj of wordsAndScores){
+    scores.push(wordObj["score"])
+  };
+//console.log(scores)
+
+const max_score = Math.max(...scores);
+//console.log(max_score)
+
+const indices = [];
+for(let i = 0; i < scores.length; i++){
+  if (scores[i] === max_score){
+    indices.push(i);
+  }
+};
+//console.log(indices)
+
+const possibleAnswers = [];
+if(indices.length === 1){
+  return wordsAndScores[indices[0]]
+} else {
+  for(let index of indices){
+    possibleAnswers.push(wordsAndScores[index])
+  };
+  //console.log(possibleAnswers)
 };
+
+  const possibleWords = [];
+  for(let wordObj of possibleAnswers){
+    possibleWords.push(wordObj["word"])
+  };
+  //console.log(possibleWords)
+
+  const wordLengths = [];
+  for(let possibleWord of possibleWords){
+    wordLengths.push(possibleWord.length)
+  };
+  //console.log(wordLengths)
+
+  if(wordLengths.includes(10)){
+    const indexOfTen = wordLengths.indexOf(10);
+    //console.log(possibleAnswers[indexOfTen])
+    return possibleAnswers[indexOfTen]
+  }
+  const smallestLength = Math.min(...wordLengths);
+  //console.log(smallestLength);
+  const indexOfSmallestLength = wordLengths.indexOf(smallestLength);
+  return possibleAnswers[indexOfSmallestLength]
+};
+
diff --git a/test/adagrams.test.js b/test/adagrams.test.js
index 1a0dc94e..ca831e5c 100644
--- a/test/adagrams.test.js
+++ b/test/adagrams.test.js
@@ -120,7 +120,9 @@ describe("Adagrams", () => {
     });
 
     it("returns a score of 0 if given an empty input", () => {
-      throw "Complete test";
+      expectScores({
+        '': 0
+      });
     });
 
     it("adds an extra 8 points if word is 7 or more characters long", () => {
@@ -133,7 +135,7 @@ describe("Adagrams", () => {
     });
   });
 
-  describe.skip("highestScoreFrom", () => {
+  describe("highestScoreFrom", () => {
     it("returns a hash that contains the word and score of best word in an array", () => {
       const words = ["X", "XX", "XXX", "XXXX"];
       const correct = { word: "XXXX", score: scoreWord("XXXX") };
@@ -145,7 +147,7 @@ describe("Adagrams", () => {
       const words = ["XXX", "XXXX", "X", "XX"];
       const correct = { word: "XXXX", score: scoreWord("XXXX") };
 
-      throw "Complete test by adding an assertion";
+      expect(highestScoreFrom(words)).toEqual(correct);
     });
 
     describe("in case of tied score", () => {