ordering list, not tuple
Merge branch 'develop' into dev-yer
pass along user_id to autosave