Update to 1.2
Add all the new stuff in 1.2