Converted leyouts to structs all the way. Did lots of other stuff.