Shield roughly working

yay
Revert "Shield roughly working"

This reverts commit f8e232e9e3d95ad992c292498d53ce62efba86af.