Attribution: Send Context

This passes the context through. 
Also, cleans up some code duplication.