need to merge aarons motion changes then sew it back up
partway