Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 18754)
+++ wp-admin/includes/template.php	(working copy)
@@ -2077,69 +2077,10 @@
  * @param string $id Screen id, optional.
  */
 function set_current_screen( $id =  '' ) {
-	global $current_screen, $hook_suffix, $typenow, $taxnow;
+	global $current_screen;
 
-	$action = '';
+	$current_screen = new WP_Screen( $id );
 
-	if ( empty($id) ) {
-		$current_screen = $hook_suffix;
-		$current_screen = str_replace('.php', '', $current_screen);
-		if ( preg_match('/-add|-new$/', $current_screen) )
-			$action = 'add';
-		$current_screen = str_replace('-new', '', $current_screen);
-		$current_screen = str_replace('-add', '', $current_screen);
-		$current_screen = array('id' => $current_screen, 'base' => $current_screen);
-	} else {
-		$id = sanitize_key($id);
-		if ( false !== strpos($id, '-') ) {
-			list( $id, $typenow ) = explode('-', $id, 2);
-			if ( taxonomy_exists( $typenow ) ) {
-				$id = 'edit-tags';
-				$taxnow = $typenow;
-				$typenow = '';
-			}
-		}
-		$current_screen = array('id' => $id, 'base' => $id);
-	}
-
-	$current_screen = (object) $current_screen;
-
-	$current_screen->action = $action;
-
-	// Map index to dashboard
-	if ( 'index' == $current_screen->base )
-		$current_screen->base = 'dashboard';
-	if ( 'index' == $current_screen->id )
-		$current_screen->id = 'dashboard';
-
-	if ( 'edit' == $current_screen->id ) {
-		if ( empty($typenow) )
-			$typenow = 'post';
-		$current_screen->id .= '-' . $typenow;
-		$current_screen->post_type = $typenow;
-	} elseif ( 'post' == $current_screen->id ) {
-		if ( empty($typenow) )
-			$typenow = 'post';
-		$current_screen->id = $typenow;
-		$current_screen->post_type = $typenow;
-	} elseif ( 'edit-tags' == $current_screen->id ) {
-		if ( empty($taxnow) )
-			$taxnow = 'post_tag';
-		$current_screen->id = 'edit-' . $taxnow;
-		$current_screen->taxonomy = $taxnow;
-	}
-
-	$current_screen->is_network = is_network_admin();
-	$current_screen->is_user = is_user_admin();
-
-	if ( $current_screen->is_network ) {
-		$current_screen->base .= '-network';
-		$current_screen->id .= '-network';
-	} elseif ( $current_screen->is_user ) {
-		$current_screen->base .= '-user';
-		$current_screen->id .= '-user';
-	}
-
 	$current_screen = apply_filters('current_screen', $current_screen);
 }
 
@@ -2271,3 +2212,97 @@
 </script>
 <?php
 }
+
+class WP_Screen {
+	var $action = '';
+	var $base;
+	var $id;
+	var $is_network;
+	var $is_user;
+	var $parent_base;
+	var $parent_file;
+	var $post_type;
+	var $taxonomy;
+
+	function __construct( $id = '' ) {
+		global $hook_suffix, $typenow, $taxnow;
+
+		$action = '';
+
+		if ( empty( $id ) ) {
+			$screen = $hook_suffix;
+			$screen = str_replace('.php', '', $screen);
+			if ( preg_match('/-add|-new$/', $screen) )
+				$action = 'add';
+			$screen = str_replace('-new', '', $screen);
+			$screen = str_replace('-add', '', $screen);
+			$this->id = $this->base = $screen;
+		} else {
+			$id = sanitize_key( $id );
+			if ( false !== strpos($id, '-') ) {
+				list( $id, $typenow ) = explode('-', $id, 2);
+				if ( taxonomy_exists( $typenow ) ) {
+					$id = 'edit-tags';
+					$taxnow = $typenow;
+					$typenow = '';
+				}
+			}
+			$this->id = $this->base = $id;
+		}
+
+		$this->action = $action;
+	
+		// Map index to dashboard
+		if ( 'index' == $this->base )
+			$this->base = 'dashboard';
+		if ( 'index' == $this->id )
+			$this->id = 'dashboard';
+	
+		if ( 'edit' == $this->id ) {
+			if ( empty($typenow) )
+				$typenow = 'post';
+			$this->id .= '-' . $typenow;
+			$this->post_type = $typenow;
+		} elseif ( 'post' == $this->id ) {
+			if ( empty($typenow) )
+				$typenow = 'post';
+			$this->id = $typenow;
+			$this->post_type = $typenow;
+		} elseif ( 'edit-tags' == $this->id ) {
+			if ( empty($taxnow) )
+				$taxnow = 'post_tag';
+			$this->id = 'edit-' . $taxnow;
+			$this->taxonomy = $taxnow;
+		}
+	
+		$this->is_network = is_network_admin();
+		$this->is_user = is_user_admin();
+	
+		if ( $this->is_network ) {
+			$this->base .= '-network';
+			$this->id .= '-network';
+		} elseif ( $this->is_user ) {
+			$this->base .= '-user';
+			$this->id .= '-user';
+		}
+	}
+
+	function set_parentage( $parent_file ) {
+		$current_screen->parent_file = $parent_file;
+		$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
+		$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+	}
+
+	function add_option( $option, $args = array() ) {
+		return add_screen_option( $option, $args );
+	}
+
+	function add_help_tab( $title, $content) {
+		// @todo update to use tabs code
+		add_contextual_help( $this, $content );
+	}
+
+	function add_help_sidebar( $content ) {
+		// @todo help links stuff
+	}
+}
\ No newline at end of file
Index: wp-admin/edit-form-advanced.php
===================================================================
--- wp-admin/edit-form-advanced.php	(revision 18754)
+++ wp-admin/edit-form-advanced.php	(working copy)
@@ -160,11 +160,10 @@
 do_action('do_meta_boxes', $post_type, 'advanced', $post);
 do_action('do_meta_boxes', $post_type, 'side', $post);
 
-add_screen_option('layout_columns', array('max' => 2, 'default' => 'auto') );
+$current_screen->add_option('layout_columns', array('max' => 2, 'default' => 'auto') );
 
 if ( 'post' == $post_type ) {
-	add_contextual_help($current_screen,
-	'<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.') . '</p>' .
+	$current_screen->add_help_tab(__('Tab title'), '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.') . '</p>' .
 	'<p>' . __('<strong>Title</strong> - Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>' .
 	'<p>' . __('<strong>Post editor</strong> - Enter the text for your post. There are two modes of editing: Visual and HTML. Choose the mode by clicking on the appropriate tab. Visual mode gives you a WYSIWYG editor. Click the last icon in the row to get a second row of controls. The HTML mode allows you to enter raw HTML along with your post text. You can insert media files by clicking the icons above the post editor and following the directions. You can go the distraction-free writing screen, new in 3.2, via the Fullscreen icon in Visual mode (second to last in the top row) or the Fullscreen button in HTML mode (last in the row). Once there, you can make buttons visible by hovering over the top area. Exit Fullscreen back to the regular post editor.') . '</p>' .
 	'<p>' . __('<strong>Publish</strong> - You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.') . '</p>' .
@@ -178,7 +177,7 @@
 	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 	);
 } elseif ( 'page' == $post_type ) {
-	add_contextual_help($current_screen, '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
+	$current_screen->add_help_tab(__('Tab title'), '<p>' . __('Pages are similar to Posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest Pages under other Pages by making one the &#8220;Parent&#8221; of the other, creating a group of Pages.') . '</p>' .
 	'<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the new in 3.2 distraction-free writing space, available in both the Visual and HTML modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box:') . '</p>' .
 	'<p>' . __('<strong>Parent</strong> - You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
 	'<p>' . __('<strong>Template</strong> - Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
Index: wp-admin/admin-header.php
===================================================================
--- wp-admin/admin-header.php	(revision 18754)
+++ wp-admin/admin-header.php	(working copy)
@@ -111,9 +111,8 @@
 <?php
 unset($title_class, $blog_name, $total_update_count, $update_title);
 
-$current_screen->parent_file = $parent_file;
-$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
-$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
+$current_screen->set_parentage( $parent_file );
+
 ?>
 
 <div id="wpbody-content">