Rebased
#2 + #3
#3
#5
Removed .orig
#6