Sprint 5&6 functionality working