Starting to Modularize thing...