Tweaked command ordering. Began mapping work.