More work on the GFX engine