Major Rewrite

Now uses $wp_query modification to work