so far
newlines
fixed TODO
Merge branch 'joseph' into develop