bring validated prototype into dev branch