MOAR MODULARITY

OMG. How was I so Lazy.