Addded database layout, draft 1 I guess