Really fixed the schema crap this time