Organize methods to match up with abstract defs