Started implementing next set of logic