reindent
reindent
reindent
add some blank lines for clarity
reindent
start to break down next block of jinja
move another big jinja monstrosity into python