Merge in Jon's view loan history use case