Another progress commit. 

Picking up speed :)