Changed the table structure a bit
Started working on the database stuff