Added old code from earlier development
Revert "Added old code from earlier development"

This reverts commit 84ca4fea4c411bd98cdfb1dc92aa48eccfce5d02.