General updates to prototype, is working on local system. Untested