Moar progress on rev 0.1