Revert "Branch derek"

Reverts derekac/derekproject#1