I think this should be part of a different ticket. Partitioning and syntax highlighting need to be updated too.