I hopefully finished taking out ambiguous steps so I can complete testing the common-lib steps