working on new features and edge case coverage