Code reviewed- TODO's added