Addresses #11 ready to test