Mostly moving things around and thinking about structure