So many changes, so little time
Removed legacy state machine (Magnum)
added, removed, moved, updated