General refactor, first commit of day. Cleaned up event emitter flow, still not returning any links since last refactor, need to troubleshoot. First, a double espresso.