Updated some of the classes to prepare for intent based message passing.
I incorrectly reformatted the tabs. This should fix it to 4 space based
tabs.