jtong - change craftmanship, design_pattern, add command_line k map