Started working on modularization