changed the database around a little bit to match new requirements.