Removed TODO comments for things I have already done