Moved everything over to a message base
new state machine arch
tweaks