new subscription system & finishing up new user model