organized some stuff
commit to merge
failed merge, dont use
Merge branch 'comments-and-organizing'