Adding in more of a model-ish layer to abstract out WP ides