chasing bugs in the prototype... Yay!