SaaS Programming assignment 2