updated data model and fixed all problems associated with it. Now i need to update the upload to server modules