Added sanity checks
Added CRUD