Moved some stuff out so I can see the wood for the trees