merging
Grid configuration load tests passing
Cell highlighting now working