interim
Merge branch 'master' into segment-presentation
almost done with this shit

that's right, shit.

SHIT SHIT SHIT
Merge branch 'segment-presentation'