Revert "Merge branch 'prototype' into 'master'"

Dallin Nickel (djn011)requested to merge
revert-afe9579b into master

This reverts merge request !37 (merged)

Merge request reports