diff --git a/client/components/V1/Generic/TextFieldComponent.tsx b/client/components/V1/Generic/TextFieldComponent.tsx
index e3888761..d185e860 100644
--- a/client/components/V1/Generic/TextFieldComponent.tsx
+++ b/client/components/V1/Generic/TextFieldComponent.tsx
@@ -1,16 +1,50 @@
 import { TextField, Button, Box } from '@mui/material'
 import { useTranslation } from 'react-i18next'
-
+import { useState } from 'react'
 
 const TextFieldComponent = () => {
     const { t } = useTranslation()
-    
-    
+
+    const [content, setContent] = useState<string>('')
+    const [isEditing, setIsEditing] = useState<boolean>(false)
+
+    const handleStopEditing = () => {
+        setIsEditing(false)
+    }
+
+    const handleStartEditing = () => {
+        setIsEditing(true)
+    }
+
     return (
         <Box sx={{ display: 'flex', flexDirection: 'column', gap: 2, alignItems: 'start' }}>
-            <TextField disabled multiline minRows={10} fullWidth label="Testattava tekstikenttä" />
-            <Button variant='contained'>{t('edit')}</Button>
-        </Box>
+            <TextField
+                disabled={!isEditing}
+                type='text'
+                defaultValue={content}
+                variant='outlined'
+                multiline
+                minRows={8}
+                fullWidth
+                label="Testattava tekstikenttä"
+                value={content}
+                onChange={(e) => setContent(e.target.value)}
+            />
+            {
+                isEditing ?
+                    <Button
+                        variant='contained'
+                        onClick={handleStopEditing}>
+                        {t('stopEditing')}
+                    </Button>
+                    :
+                    <Button
+                        variant='contained'
+                        onClick={handleStartEditing}>
+                        {t('edit')}
+                    </Button>
+            }
+        </Box >
 
     )
 }
diff --git a/client/components/V1/index.tsx b/client/components/V1/index.tsx
index 9fda71d7..36015be9 100644
--- a/client/components/V1/index.tsx
+++ b/client/components/V1/index.tsx
@@ -12,6 +12,9 @@ const Page = () => {
         <TextFieldComponent />
         
       </div>
+
+      <br />
+      <br />
       <DataComponent />
       <DataComponent />
     </div>