Move the various way highlighting to their own subpart