Revert "Just committing so I can update to master"

This reverts commit 0c6fb4fccf34af45bc767307377c8f788d450d12.
Deleting incomplete code from my fork.