Working towards v. 1.0.0