took out a couple TODO comments... and I'm done I think