listener movement almost complete, need to account for time, can now have different settings for multiple sources