Start bringing output stages over. Fix some of the fixups.