Shuffle some methods around a bit