Adding basics (for now argv[1] gets parsed out and looked up)