v. 2.0 almost done