Closes #5 Tested all good