Changed the manifest, re-wrote the database class