Adding In Excalibur and Hammerhead