Huge update to match wp-nebula progress