test
Changed extendedmethods to work more robustly.
lots of changes .. too many