Partitioner added, still need 2 work