Breaking out the controllers for simplicity.
Moved a lot of things around and adding files to make modals work. A little more work to be done for sure.