@Chris Howard -
WP4 does need to be a major overhaul.

What on earth is a "WP4"?