Move actions, notes and measurements fully into their own controllers. remove some antipatterns I was using and follow the correct pattern.