Merged order and orderWindow. This makes things much cleaner, believe it or not: the separation between order and orderWindow made the rest of the program somewhat confusing. There's still a two-way relationship between order and shift...