Added options parser
Branch-by-branch enabling/disabling
Skeleton for mask testing
Updated main