Moved controller to a better place and added translation