units 8-10. 11 in progress
merging diffs