Not really sure what I accomplished, but some thoughts.
Added Finite 'set' type.