Wrote more specs, stubbed out handle_message, refactored some minor things