Addresses #7 - not there but almost