Changes from class structure back to 'collection of methods'. Simpler.