Rebuilt the database to be simpler and added stuff to for the client endpoint to work