Added commenting functionality, needs debugging.