User branch

This looks good. You should pull it into master