Command reordering and reconfiguration

Initial commit, much more to come