Seems to be working mostly correctly now.
Waiting on Demod's client for proper testing.

Signed-off-by: retep998 <retep998@verizon.net>