Simplifying initial structure. Making more concrete functionality.