major db additions, breaks some functionality