Moving things over to userservice, so there can be user override