Update 2.0  [1028]

Changed nearly everything.