Revert "Merging from wcjohnson11/dev-three"

Reverts Azix/azix#48