Mostly finished up api controllers