Lots of changes to get status commands working and tested.