just need to make zap commenting more first class somehow, instead of an afterthought on a custom zap.