Finished Fixing the Output Messenger.

Note: Need to fix the naming scheme