Complete Redo -- Update 7

Minor changes...equal and subset still don't work?