Controller almost done