Interim checkin.  Work in progress.  Split commands into individual modules.