Merge pull request #300 from pgreyson/master

Switch, link and controller interactions.