Revert to basic working prototype