Restructured to begin modularity