Roadmap created, knocked off some @TODO comments