Moved towards function composition rather than any form of inheritance.