Complete sprint #4 implementation