Prototype 1.0.0

minor cleanup, and I'm leaving this for now to come back to later.