Started to de couple several features. Wordpress almost done.