changed some names, grid seems complete-ish