uploading refactored/final group project