Cleaned up CommandMapper.
Changed options to add IOption and changed how options work to make them all settable.