broken refactor of Gfx