- split it into both a horizontal and vertical function, both paths
got more complex. Easier to have two separate functions
- Include collapsible versions
- Fix an old bug where we were including the clues in the vertical
height anyway.

We aren't calculating the correct vertical value yet, but it's closer
to correct