Fix crash; handle BoP ground covers
Lots of decoupling, preparing for second half of refactoring
Hack hack hack... hack hack hack... aaaaghhhhhh