Had2012 2

RA1-related code from Yossof, in progress.