Some modifications in anticipation of Gfx eventually being cross platform + setup basic testing rig. tests forthcoming