System State Changes

Branch should be feature complete.

Please review and give feedbach if anything is missing, needs to be changed or clarified.