Trying to break things into libraries.