Model1 mostly done