prep prototyping refactor
Revert "prep prototyping refactor"

This reverts commit 00508c350294c494ce3197a3e6ec44f7c8f60fae.
prepared prototype refactor
Merge branch 'development'