Working on getting all the CRUD up and running