Finishing touches for Sprint 2

Added the finishing touches for Sprint 2