Move more methods out into seperate modules