a bunch more work on the gridcontainer and some revamping of the basecontainer