refactored some pmo scenarios, finished a couple more