Reworked to make it CRUD-able