Implement feedback and tests