Database work from W3 D2