Cleaned up connection and working on grid