Refactor State Management Milestone

This is for the next milestone about refactoring the state management scheme and some smaller other things.

Couple things to do before merge:

• Rebase with master
• Test the toolchain editor changes a bit more (refactoring the history management was pretty complex, maybe clean that up)