Saving with 25 minutes left.

Tried to implement some of the tests.