Modularized code a bit, continued build