Added note to self to add support for random partition