Update ControllerStructure Branch

Bringing the ControllerStructure branch up to date with the Master so I can start experimenting with callback user input in Frame.