Chinmay/add rollup tool