Oops, missing self in bunch of calls... been too long since writing Python ;)