Api Controller almost done