Finally got rid of the *BAD* machine layer.
Added a lot more to the shield system.
Still a lot more work to do...