updates to prototype, still a work in progress