finished moving things around...i think