Some more porting of the Dancer 1 Stuff