Modularized some code, refactored, tested stuff, included article