Beginning to add some modularity