move core functionality from wizard pages