Move some code - make sure webservice works with build in strategies