Revert "Mat's Initial Contribution"

This reverts commit 91a9a4c6288665391498b9e37d1accb2a4c82ff9.