Added checkTables and createTables to database
Refactored some names
Added some TODOS