working on subs
Merge branch 'master' into feat-subscriptions
checking in subscription work
removed addresses from customer model
updated customer code