Release 2 Sprint 2

Stopping place for summer