Finsihing up 1.0