Dev of WP

Less talk more action