Prototype 1.0 Complete for handing to client

Not all basic functionality actually works.