Adding some junk into the graphics components

Previous TODO still valid ;-)