Worked some more on modularizing