wip
etc
merge from Rassler
dd
sdf
back working with history change