More changes
Junk
Updates
Finally got some tests to work
Saving to db
Refactoring the code so that it's more readable.
A little more refactoring.
Adding timeout