Added shield system and more testing