Started refactoring receiver

@tonytlwu - leaving the rest of this with you for when initial 2048
code is integrated ;).