Add basic partition, still fixing bugs