Added raw sign up for Nomnom / Refactored service classes