changes to get includes to work on server and changes to fix CRUD