a bit more shuffling around
shuffle a few things around