Added db fields, took brief pass at relationships