Major changes, in progress

Writing up direct products as discussed with Sasha. Not finished yet.