Ben Dusinberre - 2011-03-01

Mostly working, needs debugging and testing