cleaned up files, switch to arraydatamodel complete