Adding Spork and Guard