Move some things into a lib.
Who knows.