Cleaning up and added grid stub