Move some more functionality about