Fixed complete controller stuff so that it actually works