Clean up debug
Prelim stab at linking Scenario and User
Linking in init_db
Separate users works