Updated TODO
Refactor, using virtual-hyperscript and svg helper