moved around some NotImplementedErrors
fixed arg problem