Move Grid into Objects, separate acceleration scheme