Refactored and Ready for Cloud Deployment