First half of basic implementation completed in PageControl branch.