beta version 1.0 almost done