Revert "Wcjohnson11/dev"

Reverts Accidental merging at Azix/azix#37