Add bundle --binstubs
Add guard and spork