final changes to shitty prototype