Refactor stuff, add CRUD.