Revert "Starting over on prototype"

This reverts commit fb238544f09f83b3c190914e72369d944609bf6f.