Assessment work for Advidi - work in progress