Draft-version database design, as created on 26-04