I've started work on making the prototype more OO.