(just looking at layout-gen some more)