Working through wp-includes
Initial draft complete