Beginnings of shield rendering
Clean up