Updated Read Me and TODO's