WIP squash some comments