Cleaned up code, ensured 100% controller testing, finished controller API