Tweak species one counterpoint and add species two

Not all rules included yet, but getting there