AtE setup, Try 2, Part 2b

-parts of gfx added.