Fix some bundler issues
Adds Kelsey and Jake