WIP: Klawrence new branch

Closed Kristen requested to merge klawrence_new_branch into master