story 2 implementation complete