Non-WP now builds ok for dist
Both dev and build for WP and non-WP now function correctly