Brings up to working order, other than Defense mode which isn't testable just yet.
Now need to do code cleanup.