middle of modifying models to fit new data structure