Quick change to support sequence and other minor things. Needs clean up though already.