Add more types to message.
All types supported.
Reorganising files.

This likely doesn't work. Just doing a checkpoint.
A little more progress.
It builds!