Complete rebuild v. 1.1