setup for Jason
Merge branch 'Bindery2.0' into UserFix