Implement new functionality (the easy part)