small changes, starting to add grid