actually added sidetrail
Merge branch 'sidetrail'