Fix all methods that used to be functions -add self to everything