Adding Guard and Spork