Addresses #12 ready for testing