Generation work

Beginnings of rewriting room generation