Add column, line, and pie controllers
Add map controller
Cleanup deleted
Merge branch 'update-controllers' into development