Some progress
-update grid needs fixing
-other than that, i think we are gucci