Progress made on reworking grid and tree