Working on expanding the routes/controllers a bit