adding todo & removing cruft