moving stuff around into a more sensible pattern