Final commit before changing up database elements etc