moved quads, cubics and quints to core
develop merge