Continuing to reogranize things. Added things for future logging and message passing.