Basic Functionality completed. All tests pass