More RESTful re-factor.