Added some basic Controller things