Added a few comments for stuff TODO