Change how listeners are passed around
Fix load path