Crud and refactor
Crud and refactor