Started work on partition support