Made some adjustments and added TODO's on what needs to be done