Made into system-wide singleton and passed command line args to original instance; closes #17