Add movement keys.  Also add toggles for different groupings.