added some TODOs
the comments, compiling this time