can you change this to use 'from comment import Comment' style imports, thats what we use elsewhere