First commit, some progress with delegates. Need to work around the  cache