Move stuff around to keep the changes as close to
each other as possible, again for diff purposes :)