First shot at porting to maker