finish crud
Merge With angust-zou's Code
Change Spec