New controllers and views... need to do some work though

Signed-off-by: Aaron Johnson <aaron.a.johnson@outlook.com>