Start thinking about merging the smr1d module back into master