DB design mostly finished