Move remaining stuff from controller