Added slightly tidied up versions of the command list and command manager from PBF