Partial implementation of colspan and rowspan.

Still a WIP, but colspan is working properly and rowspan is mostly
there.