Solidified 8-4 area

It mostly works now, except for #231.

Fixes #195.