diff --git a/BankAccounts.rb b/BankAccounts.rb
index 6294fed3..bd4adf04 100644
--- a/BankAccounts.rb
+++ b/BankAccounts.rb
@@ -5,6 +5,9 @@ module Bank
 
   class Account
 
+    MIN_BALANCE = 0
+    FEE = 0
+
     attr_reader :balance, :owner, :account_id
 
     def initialize(account_id, initial_balance, open_date)
@@ -14,8 +17,8 @@ def initialize(account_id, initial_balance, open_date)
     end
 
     def withdraw(amount)
-      if amount <= @balance
-        @balance -= amount
+      if amount <= @balance - self.class::MIN_BALANCE - self.class::FEE
+        @balance -= (amount + self.class::FEE)
       else
         puts "Your balance is #{@balance}. You cannot withdraw #{amount} at this time."
         return @balance
@@ -27,8 +30,8 @@ def deposit(amount)
     end
 
     def check_initial_balance(initial_balance)
-      if initial_balance < 0
-        raise ArgumentError.new("Your initial balance must be positive!")
+      if initial_balance < self.class::MIN_BALANCE
+        raise ArgumentError.new("Your initial balance must be more than #{self.class::MIN_BALANCE}!")
       else
         return initial_balance
       end
diff --git a/CheckingAccount.rb b/CheckingAccount.rb
new file mode 100644
index 00000000..2ed0a593
--- /dev/null
+++ b/CheckingAccount.rb
@@ -0,0 +1,36 @@
+module Bank
+
+  class CheckingAccount < Account
+
+    FEE = 100
+
+    def initialize (account_id, initial_balance, open_date)
+      super
+      @free_check = 3
+    end
+
+    def withdraw_using_check(amount)
+      if @free_check > 0
+        check_fee = 0
+      else
+        check_fee = 200
+      end
+
+      if (amount + check_fee) <= (@balance + 1000)
+          @balance -= (amount + check_fee)
+          @free_check -= 1
+      else
+        puts "Your account cannot overdraft by more than 1000. Your balance is #{@balance} so you cannot write a check for #{amount} at this time."
+      end
+      return @balance
+    end
+
+    def reset_checks
+      @free_check = 3
+    end
+
+
+
+  end
+
+end
diff --git a/MoneyMarketAccount.rb b/MoneyMarketAccount.rb
new file mode 100644
index 00000000..160eabb0
--- /dev/null
+++ b/MoneyMarketAccount.rb
@@ -0,0 +1,50 @@
+module Bank
+
+  class MoneyMarketAccount < SavingsAccount
+
+    MIN_BALANCE = 1000000
+
+    attr_reader :transaction_count
+
+    def initialize (account_id, initial_balance, open_date)
+      super
+      @transaction_count = 0
+    end
+
+    def withdraw(amount)
+        if account_frozen? || transaction_count_exceeded?
+          return @balance
+        elsif amount <= @balance - self.class::MIN_BALANCE
+          @balance -= amount
+        else
+          @balance -= (amount + 10000)
+        end
+      @transaction_count += 1
+      return @balance
+    end
+
+    def deposit(amount)
+      if transaction_count_exceeded?
+        return @balance
+      elsif account_frozen? && (@balance + amount) >= self.class::MIN_BALANCE
+      else
+        @transaction_count += 1
+      end
+      super
+    end
+
+    def account_frozen?
+      @balance < self.class::MIN_BALANCE
+    end
+
+    def transaction_count_exceeded?
+      @transaction_count >= 6
+    end
+
+    def reset_transactions
+      @transaction_count = 0
+    end
+
+  end
+
+end
diff --git a/README.md b/README.md
index 25fd4d2a..b6e5c7b2 100644
--- a/README.md
+++ b/README.md
@@ -73,24 +73,23 @@ Create an `Account` class which should have the following functionality:
     **Account ID** - (Fixnum) a unique identifier corresponding to an account
     **Owner ID** - (Fixnum) a unique identifier corresponding to an owner
 
-<!--
 ## Wave 3
-Create a `SavingsAccount` class which should inherit behavior from the `Account` class. It should include updated logic with the following functionality:
-- An updated `initialize` method:
-  - The initial balance cannot be less than $10. If it is, this will `raise` an `ArgumentError`
-- An updated `withdraw` method:
+Create a `SavingsAccount` class which should inherit behavior from the `Account` class. It should include the following updated functionality:
+- The initial balance cannot be less than $10. If it is, this will `raise` an `ArgumentError`
+- Updated withdrawal functionality:
   - Each withdrawal 'transaction' incurs a fee of $2 that is taken out of the balance.
   - Does not allow the account to go below the $10 minimum balance - Will output a warning message and return the original un-modified balance
 
-It should include the following new methods:
+It should include the following new method:
 - `#add_interest(rate)`: Calculate the interest on the balance and add the interest to the balance. Return the **interest** that was calculated and added to the balance (not the updated balance).
   - Input rate is assumed to be a percentage (i.e. 0.25).
   - The formula for calculating interest is `balance * rate/100`
     - Example: If the interest rate is 0.25% and the balance is $10,000, then the interest that is returned is $25 and the new balance becomes $10,025.
 
-Create a `CheckingAccount` class which should inherit behavior from the `Account` class. It should include updated logic with the following functionality:
-- `#withdraw(amount)`: The input amount gets taken out of the account as result of an ATM transaction. Each withdrawal 'transaction' incurs a fee of $1 that is taken out of the balance. Returns the updated account balance.
-  - Does not allow the account to go negative. Will output a warning message and return the original un-modified balance.
+Create a `CheckingAccount` class which should inherit behavior from the `Account` class. It should include the following updated functionality:
+- Updated withdrawal functionality:
+  - Each withdrawal 'transaction' incurs a fee of $1 that is taken out of the balance. Returns the updated account balance.
+    - Does not allow the account to go negative. Will output a warning message and return the original un-modified balance.
 - `#withdraw_using_check(amount)`: The input amount gets taken out of the account as a result of a check withdrawal. Returns the updated account balance.
   - Allows the account to go into overdraft up to -$10 but not any lower
   - The user is allowed three free check uses in one month, but any subsequent use adds a $2 transaction fee
@@ -101,16 +100,15 @@ Create a `CheckingAccount` class which should inherit behavior from the `Account
 
 ## Optional:
 
-Create a `MoneyMarketAccount` class with a minimum of 6 specs. The class should inherit behavior from the `Account` class.
+Create a `MoneyMarketAccount` class which should inherit behavior from the `Account` class.
 - A maximum of 6 transactions (deposits or withdrawals) are allowed per month on this account type
-- `self.new(id, initial_balance)`: creates a new instance with the instance variable `id` and 'initial_balance' assigned
-  - The initial balance cannot be less than $10,000 - this will `raise` an `ArgumentError`
-- `#withdraw(amount)`: The input amount gets taken out of the account as result of an ATM transaction. Returns the updated account balance.
+- The initial balance cannot be less than $10,000 - this will `raise` an `ArgumentError`
+- Updated withdrawal logic:
   - If a withdrawal causes the balance to go below $10,000, a fee of $100 is imposed and no more transactions are allowed until the balance is increased using a deposit transaction.
   - Each transaction will be counted against the maximum number of transactions
-- `#deposit(amount)`. Returns the updated account balance.
+- Updated deposit logic:
   - Each transaction will be counted against the maximum number of transactions
   - Exception to the above: A deposit performed to reach or exceed the minimum balance of $10,000 is not counted as part of the 6 transactions.
-- `#add_interest(rate)`: Calculate the interest on the balance and add the interest to the balance. Return the interest that was calculated and added to the balance (not the updated balance). Note** This is the same as the `SavingsAccount` interest.
+- `#add_interest(rate)`: Calculate the interest on the balance and add the interest to the balance. Return the interest that was calculated and added to the balance (not the updated balance).
+    - Note** This is the same as the `SavingsAccount` interest.
 - `#reset_transactions`: Resets the number of transactions to zero
--->
diff --git a/SavingsAccount.rb b/SavingsAccount.rb
new file mode 100644
index 00000000..3cf69713
--- /dev/null
+++ b/SavingsAccount.rb
@@ -0,0 +1,21 @@
+module Bank
+
+  class SavingsAccount < Account
+
+    MIN_BALANCE = 1000
+    FEE = 200
+
+      def initialize (account_id, initial_balance, open_date)
+        super
+      end
+
+      def add_interest(rate)
+        interest = @balance * (rate/100)
+        @balance += interest
+        return interest
+      end
+
+
+  end
+
+end
diff --git a/bank.rb b/bank.rb
new file mode 100644
index 00000000..481c5ea8
--- /dev/null
+++ b/bank.rb
@@ -0,0 +1,4 @@
+require "./BankAccounts.rb"
+require "./SavingsAccount.rb"
+require "./CheckingAccount.rb"
+require "./MoneyMarketAccount.rb"