Revert "Aadq67/sprint4"

This shouldn't have been placed in master. Was supposed to be in a test branch.