modifying Command app to be more standalone in nature.