got top level merged a little better.

Need to finish layout for converters and trigen.