Issue #5 Work complete. Time to test