Moved old code; more work on generation