finish decoupling from oscar server #14