Made progress on splitting functionality