Revert "Wcjohnson11/dev"

Reverts Azix/azix#37