Srcloc

Pat: in case you want to look at this before rebasing.