Ported over some required stuff
Missed a file
Merge branch 'Gotham_master'