Adding guard and spork
fix merge conflicts? wtf