Completely hacked for Nov 13 demo.....
When do we clean up this mess???