OK, I fixed the currentSource stuff... we were formerly on the wrong