Fix for #406 - back to simple base layer.

Also addresses #463