Worked on Source and Listener classes - MessageLogListener and ServiceProxyListener. Builds successfully but have not tested for bugs at all yet.