Just a heads up -- this will need to be updated just prior to merge. There have been a number of DB changes in the last few days.