Added some comments with things I need to do.