Sprint 3 integration

Fixes and new implementations