Started with upgrade scripts
Moved some things around
Refactored some code and created an upgrade script
Updated terms and conditions