keeping work on refactor of Gfx, probably it would be better to do it from scratch to avoid successive problems