Database basically modified. Needs to be cleaned up.