added a bunch of TODO lines