First completed version for Design Spec