GitHub #64: Refactor M1 commands and selection box code, work on edit/control split