Added controller endpoints. some things still extra sloppy