wip on comments