attempting restructure of receiver portion to use calculus
Merge remote-tracking branch 'origin/master'