Ott2

Lots of work on 'smasher' from a month or so ago. Time to merge it into master.