Converted zip function to new system
Added back zipped map function
Added back mapcat, filter, remove