diff --git a/tools/charactercreation/characterdata.xml b/tools/charactercreation/characterdata.xml
index 9b0b2a9..e1bc770 100644
--- a/tools/charactercreation/characterdata.xml
+++ b/tools/charactercreation/characterdata.xml
@@ -1,11 +1,19 @@
 <DataStructure Name="characterdata">
     <Version>1</Version>
     <Groups>
+        <Group Name="flow">
+            <Variables>
+                <String Name="currentPage">
+                    <Value>newchar</Value>
+                </String>
+            </Variables>
+        </Group>
         <Group Name="definition">
             <Variables>
                 <String Name="name">
                     <Max>64</Max>
                 </String>
+                <String Name="gender"/>
                 <Bool Name="ismage"/>
             </Variables>
         </Group>
@@ -16,10 +24,5 @@
                 <Int Name="speed"/>
             </Variables>
         </Group>
-        <Group Name="buff">
-            <Variables>
-                <Int Name="speed"/>
-            </Variables>
-        </Group>
     </Groups>
 </DataStructure>
\ No newline at end of file
diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index e2f2315..a8466d5 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -25,14 +25,14 @@
                     <OnPostLoad>
                         <Actions>
                             <OpenPage>
-                                <Page>"newchar"</Page>
+                                <Page>[data.character.flow.currentPage]</Page>
                             </OpenPage>
                         </Actions>
                     </OnPostLoad>
                     <OnPostCreate>
                         <Actions>
                             <OpenPage>
-                                <Page>"newchar"</Page>
+                                <Page>[data.character.flow.currentPage]</Page>
                             </OpenPage>
                         </Actions>
                     </OnPostCreate>
@@ -46,7 +46,7 @@
         <Page Name="newchar">
             <Content>
                 <GridContainer>
-                    <Cols>3</Cols>
+                    <Cols>2</Cols>
                     <Content>
                         <Label>
                             <Text>"Name"</Text>
@@ -54,24 +54,9 @@
                         <StringInput>
                             <Output>[data.character.definition.name]</Output>
                         </StringInput>
-                        <Label>
-                            <Text>[data.character.definition.name]</Text>
-                        </Label>
                         <Label>
                             <Text>"Rasse"</Text>
                         </Label>
-                        <Label>
-                            <Text>[data.character.race.name]</Text>
-                        </Label>
-                        <Label>
-                            <Text>[data.character.race.speed]</Text>
-                        </Label>
-                        <Label>
-                            <Text>"Add Speed"</Text>
-                        </Label>
-                        <IntInput>
-                            <Output>[data.character.buff.speed]</Output>
-                        </IntInput>
                         <BaseSingleSelect>
                             <Base>[base.races.Playable]</Base>
                             <Output>[data.character.race.id]</Output>
@@ -87,21 +72,56 @@
                                 </PropertyOutput>
                             </PropertyOutputs>
                         </BaseSingleSelect>
+                        <Button>
+                            <Text>"Weiter"</Text>
+                            <OnClick>
+                                <Actions>
+                                    <Action>
+                                        <Do>"profile"</Do>
+                                        <Output>[data.character.flow.currentPage]</Output>
+                                    </Action>
+                                    <OpenPage>
+                                        <Page>[data.character.flow.currentPage]</Page>
+                                    </OpenPage>
+                                </Actions>
+                            </OnClick>
+                        </Button>
+                        <MarkdownDisplay>
+                            <MarkdownId>[data.character.race.id]</MarkdownId>
+                        </MarkdownDisplay>
                     </Content>
                 </GridContainer>
-                <Label>
-                    <Text>"Your race has "</Text>
-                </Label>
-                <Label>
-                    <Text>[data.character.race.speed] + [data.character.buff.speed]</Text>
-                </Label>
-                <Label>
-                    <Text>" speed"</Text>
-                </Label>
-                <MarkdownDisplay>
-                    <MarkdownId>[data.character.race.id]</MarkdownId>
-                </MarkdownDisplay>
             </Content>
         </Page>
+        <Page Name="profile">
+             <Content>
+                 <HorizontalContainer>
+                     <Content>
+                         <Button>
+                             <Text>"Profil"</Text>
+                             <OnClick>
+                                 <Actions>
+                                     <Action>
+                                         <Do>"profile"</Do>
+                                         <Output>[data.character.flow.currentPage]</Output>
+                                     </Action>
+                                     <OpenPage>
+                                         <Page>[data.character.flow.currentPage]</Page>
+                                     </OpenPage>
+                                 </Actions>
+                             </OnClick>
+                         </Button>
+                     </Content>
+                 </HorizontalContainer>
+                 <GridContainer>
+                     <Cols>2</Cols>
+                     <Content>
+                         <Label>
+                             <Text>"Profile Page!"</Text>
+                         </Label>
+                     </Content>
+                 </GridContainer>
+             </Content>
+        </Page>
     </Pages>
 </Tool>
diff --git a/tools/test/testdata.xml b/tools/test/testdata.xml
new file mode 100644
index 0000000..93e294d
--- /dev/null
+++ b/tools/test/testdata.xml
@@ -0,0 +1,25 @@
+<DataStructure Name="testdata">
+    <Version>1</Version>
+    <Groups>
+        <Group Name="definition">
+            <Variables>
+                <String Name="name">
+                    <Max>64</Max>
+                </String>
+                <Bool Name="ismage"/>
+            </Variables>
+        </Group>
+        <Group Name="race">
+            <Variables>
+                <String Name="id"/>
+                <String Name="name"/>
+                <Int Name="speed"/>
+            </Variables>
+        </Group>
+        <Group Name="buff">
+            <Variables>
+                <Int Name="speed"/>
+            </Variables>
+        </Group>
+    </Groups>
+</DataStructure>
\ No newline at end of file
diff --git a/tools/test/testtool.xml b/tools/test/testtool.xml
new file mode 100644
index 0000000..1f17b88
--- /dev/null
+++ b/tools/test/testtool.xml
@@ -0,0 +1,107 @@
+<Tool>
+    <Name>Test Tool</Name>
+    <AccessRule>[rule.access]</AccessRule>
+    <Display>Test Tool</Display>
+    <Description>The Test Tool</Description>
+    <Data>
+        <DataSlot Name="character">
+            <DataStructure>testdata</DataStructure>
+        </DataSlot>
+    </Data>
+    <Bases>
+        <BaseReference Name="races">
+            <Path>wiki/races/Races</Path>
+        </BaseReference>
+    </Bases>
+    <StartPage>"start"</StartPage>
+    <Pages>
+        <Page Name="start">
+            <Content>
+                <DataSlotLoader>
+                    <DataSlot>[data.character]</DataSlot>
+                    <Create>
+                        <Rule>[rule.createcharacter]</Rule>
+                    </Create>
+                    <OnPostLoad>
+                        <Actions>
+                            <OpenPage>
+                                <Page>"newchar"</Page>
+                            </OpenPage>
+                        </Actions>
+                    </OnPostLoad>
+                    <OnPostCreate>
+                        <Actions>
+                            <OpenPage>
+                                <Page>"newchar"</Page>
+                            </OpenPage>
+                        </Actions>
+                    </OnPostCreate>
+                </DataSlotLoader>
+            </Content>
+            <!--
+            <OnOpen/>
+            <OnClose/>
+            -->
+        </Page>
+        <Page Name="newchar">
+            <Content>
+                <GridContainer>
+                    <Cols>3</Cols>
+                    <Content>
+                        <Label>
+                            <Text>"Name"</Text>
+                        </Label>
+                        <StringInput>
+                            <Output>[data.character.definition.name]</Output>
+                        </StringInput>
+                        <Label>
+                            <Text>[data.character.definition.name]</Text>
+                        </Label>
+                        <Label>
+                            <Text>"Rasse"</Text>
+                        </Label>
+                        <Label>
+                            <Text>[data.character.race.name]</Text>
+                        </Label>
+                        <Label>
+                            <Text>[data.character.race.speed]</Text>
+                        </Label>
+                        <Label>
+                            <Text>"Add Speed"</Text>
+                        </Label>
+                        <IntInput>
+                            <Output>[data.character.buff.speed]</Output>
+                        </IntInput>
+                        <BaseSingleSelect>
+                            <Base>[base.races.Playable]</Base>
+                            <Output>[data.character.race.id]</Output>
+                            <Display>[file.name]</Display>
+                            <PropertyOutputs>
+                                <PropertyOutput>
+                                    <Property>[data.race.speed]</Property>
+                                    <Output>[data.character.race.speed]</Output>
+                                </PropertyOutput>
+                                <PropertyOutput>
+                                    <Property>[file.name]</Property>
+                                    <Output>[data.character.race.name]</Output>
+                                </PropertyOutput>
+                            </PropertyOutputs>
+                        </BaseSingleSelect>
+                    </Content>
+                </GridContainer>
+                <Label>
+                    <Text>"Your race has "</Text>
+                </Label>
+                <Label>
+                    <Text>[data.character.race.speed] + [data.character.buff.speed]</Text>
+                </Label>
+                <Label>
+                    <Text>" speed"</Text>
+                </Label>
+                <MarkdownDisplay>
+                    <MarkdownId>[data.character.race.id]</MarkdownId>
+                </MarkdownDisplay>
+            </Content>
+        </Page>
+    </Pages>
+</Tool>
diff --git a/worlddawn.xml b/worlddawn.xml
index 99d6c29..32c8151 100644
--- a/worlddawn.xml
+++ b/worlddawn.xml
@@ -38,6 +38,16 @@
                 <AccessRule>isLoggedIn()</AccessRule>
             </ToolArea>
         </ToolAreas>
+        <ToolAreas>
+            <ToolArea>
+                <Path>test</Path>
+                <Name>Tooltest</Name>
+                <Description>Testing Tools</Description>
+                <DisplayInBar>true</DisplayInBar>
+                <SortPriority>150</SortPriority>
+                <AccessRule>isLoggedIn()</AccessRule>
+            </ToolArea>
+        </ToolAreas>
     </ToolConfig>
     <BaseConfig>
         <ParameterConfigs>