Started reshuffling staged_changes method
Rewrote staged_changes to implement new options. Some tests failing