Still brining in architecture from ContextRxStuff.

Signed-off-by: William Raiford <bill.mybiz@gmail.com>