Moved Comment functionality into standalone file which removes 3-4 ugly hacks