Minor changes to Gate and changes to accomodate for this
Added Comparators
Added Enum
Maybe works