Rsickles rebase me

Sorry for being so late. I hope my second attempt can still be looked at.