Added expansion, attempts to fix list rendering.
There will be many commits for now until I get local rendering
working. Too late for it right now.