More Speed ups, new Shape class.

Just some massie speedups and a nifty demo.