Tentatively complete. Fixed little run-time bug. Work on messages