super-mega commit of lotsa content!