Added in some sad little structural bits