Separate out data, add in views and controller.
Checkpoint - start restructuring for query and listing data.