Implemented all of the work done by me and Ben.
Revert "Implemented all of the work done by me and Ben."

This reverts commit 2e273173f7c240a4b2b965421f010069087976c9.