Changeset 8

Restarted dev on endpoints after architecture rework. Note there is a
build error on the controller and controller consoles in this checkin!