Created a working shield formation and merged. Fixed a few bugs.