first draft

Some more should be pushed tomorrow night...