Added support for --3x, --master, and --wip