Final Week 2 Changes

Still don't have CRUD working 100%