Update 1.0

Name changes mostly and testing new ideas.