Moving stuff into BaseController to simplify things :beer: