Move some methods around