Command line options + start of adding factories