Structural changes that I hope will make it easier to add to