Revert "Merge branch 'Feature-addmacros' into 'prototype'"

Dallin looks like you didn't rebase before merging into prototype This reverts merge request !56 (merged)