Working on more modularity