Small and hasty attempt to implement first item of Roadmap.