Works, now working on the gfx side
New gfx