Branch v2 dry stuff

Any reason for this to be better than how it was before?