unmerged. optimizations
rebase not totally smooth
merge