Modularized and added first option-parsing draft