Done with this branch and go to work on partition.