prep
done for the morning
Merge branch 'member_model_2'