Added todos and comments