Updated shapes with some bad ass shapes, Added EWA Filtering thanks to lewis@lewissaunders.com