Improve the Controller organization and begin to work on the deletion feature.