Converted all List operations to generic version

Also made sure testing passes