Testing

Ran into a few walls
Updated tests
I need to commit more often