working toward multi stage alignment, big changes from last version