Rearranged methods.
More cleanup.
About to refactor run-loop to message proxy.
Initial version of message proxy working.