Helium approx 17/04/14

This is my helium version rebased onto the current master.