Trying to modularize Part 2