Final Update - Comments Working