Added some TODO tags and improved the Diagram