moving things around some more
somewhat done with moving things around