implemented bitset comparisons

Added bitset comparisons rather than the map comparisons I was doing
previously. (Mapped comparisons are still in the code until I get the
bitsets to work)