More work on Uniform.

Uniform dungeon builder broken, but coming along.