Primera version, anadida base, closes #1