diff --git a/questtypes/bossfight/BossfightQuesttypeController.inc b/questtypes/bossfight/BossfightQuesttypeController.inc
index 1be33644..c2382266 100644
--- a/questtypes/bossfight/BossfightQuesttypeController.inc
+++ b/questtypes/bossfight/BossfightQuesttypeController.inc
@@ -25,6 +25,27 @@
          * @var array
          */
         public $models = array('media');
+        /**
+         * Required components
+         *
+         * @var array
+         */
+        public $components = array('validation');
+
+        private $validationSettings = array(
+            'bossname' => array(
+                'minlength' => 1,
+                'maxlength' => 32
+            ),
+            'lives_boss' => array(
+                'minlength' => 1,
+                'regex'     => '/^(\d*)$/'
+            ),
+            'lives_character' => array(
+                'minlength'     => 1,
+                'regex'         => '/^(\d*)$/'
+            )
+        );
 
 
 
@@ -227,23 +248,199 @@
          */
         public function edittask($seminary, $questgroup, $quest)
         {
+            // Get Fight
             $fight = $this->Bossfight->getBossFight($quest['id']);
-            /*
             if(!is_null($fight['boss_seminarymedia_id'])) {
                 $fight['bossmedia'] = $this->Media->getSeminaryMediaById($fight['boss_seminarymedia_id']);
             }
-            */
 
-            // Get stages
-            $stage = $this->Bossfight->getFirstStage($quest['id']);
-            $stage['childs'] = $this->getChildStages($stage['id']);
+            // Get Character
+            $character = $this->Characters->getCharacterForUserAndSeminary($this->Auth->getUserId(), $seminary['id']);
+
+            // Create (pseudo) tree
+            $tree = $this->createStageTree($fight['lives_character'], $fight['lives_boss']);
+            $this->attachStages($quest['id'], $tree);
+
+            // TODO Test
+            print_r($this->createStageTree2($quest['id'], $fight['lives_character'], $fight['lives_boss']));
+
+            // Get allowed mimetypes
+            $mimetypes = \nre\configs\AppConfig::$mimetypes['questtypes'];
+
+            // Values
+            $step = 1;
+            $steps = 1;
+            $bossname = $fight['bossname'];
+            $livesCharacter = $fight['lives_character'];
+            $livesBoss = $fight['lives_boss'];
+            $fields = array('bossname', 'lives_boss', 'lives_character');
+            $validation = true;
+
+            // Save submitted data
+            if($this->request->getRequestMethod() == 'POST')
+            {
+                // Get current step
+                $step = max(0, min($steps, intval($this->request->getPostParam('step'))));
+
+                // Bossfight
+                if($step == 0)
+                {
+                    // Get params and validate them
+                    $validation = $this->Validation->validateParams($this->request->getPostParams(), $fields, $this->validationSettings);
+                    $bossname = $this->request->getPostParam('bossname');
+                    $livesCharacter = $this->request->getPostParam('lives_character');
+                    $livesBoss = $this->request->getPostParam('lives_boss');
+
+                    // Validate image
+                    $bossimage = null;
+                    if(!empty($_FILES) && array_key_exists('bossimage', $_FILES) && $_FILES['bossimage']['error'] != UPLOAD_ERR_NO_FILE)
+                    {
+                        $bossimage = $_FILES['bossimage'];
+
+                        // Check error
+                        if($bossimage['error'] !== UPLOAD_ERR_OK) {
+                            $validation = $this->Validation->addValidationResult($validation, 'bossimage', 'error', $bossimage['error']);
+                        }
+
+                        // Check mimetype
+                        $bossimageMimetype = null;
+                        $bossimage['mimetype'] = \hhu\z\Utils::getMimetype($bossimage['tmp_name'], $bossimage['type']);
+                        foreach($mimetypes as &$mimetype)
+                        {
+                            if($mimetype['mimetype'] == $bossimage['mimetype']) {
+                                $bossimageMimetype = $mimetype;
+                                break;
+                            }
+                        }
+                        if(is_null($bossimageMimetype)) {
+                            $validation = $this->Validation->addValidationResult($validation, 'bossimage', 'mimetype', $bossimage['mimetype']);
+                        }
+                        elseif($bossimage['size'] > $bossimageMimetype['size']) {
+                            $validation = $this->Validation->addValidationResult($validation, 'bossimage', 'size', $bossimageMimetype['size']);
+                        }
+                    }
+
+                    // Set Bossfight data
+                    if($validation === true)
+                    {
+                        // Upload boss image
+                        $mediaId = $this->Media->createQuestMedia(
+                            $this->Auth->getUserId(),
+                            $seminary['id'],
+                            sprintf('quest-bossfight-%s', $quest['url']),
+                            '',
+                            $bossimage['mimetype'],
+                            $bossimage['tmp_name']
+                        );
+
+                        // Save data
+                        if(!is_null($fight))
+                        {
+                            // Edit Bossfight
+                            $this->Bossfight->editBossFight(
+                                $quest['id'],
+                                $bossname,
+                                ($mediaId !== false ? $mediaId : $fight['boss_seminarymedia_id']),
+                                $livesCharacter,
+                                $livesBoss
+                            );
+
+                            // TODO Delete needless stages
+                        }
+                        elseif($mediaId !== false)
+                        {
+                            // Create new Bossfight
+                            $this->Bossfight-createBossFight(
+                                $this->Auth->getUserId(),
+                                $quest['id'],
+                                $bossname,
+                                $mediaId,
+                                $livesCharacter,
+                                $livesBoss
+                            );
+                        }
+
+                        // Reload fight
+                        $fight = $this->Bossfight->getBossFight($quest['id']);
+                        if(!is_null($fight['boss_seminarymedia_id'])) {
+                            $fight['bossmedia'] = $this->Media->getSeminaryMediaById($fight['boss_seminarymedia_id']);
+                        }
+                        $tree = $this->createStageTree($fight['lives_character'], $fight['lives_boss']);
+                        $this->attachStages($quest['id'], $tree);
+                    }
+                }
+                // Stages
+                elseif($step == 1)
+                {
+                    // Get stages
+                    $stages = $this->request->getPostParam('stages');
+
+                    // Save stages
+                    foreach($tree as $i => &$v)
+                    {
+                        if(array_key_exists($i, $stages))
+                        {
+                            foreach($v as $j => &$h)
+                            {
+                                if(array_key_exists($j, $stages[$i]))
+                                {
+                                    /*
+                                    $text = $stages[$i][$j]['text'];
+                                    $question = $stages[$i][$j]['question'];
+                                    if(array_key_exists('stage', $h) && !empty($h['stage']))
+                                    {
+                                        // TODO Edit stage
+                                        $stageId = $h['stage']['id'];
+                                        var_dump($stageId);
+                                    }
+                                    else
+                                    {
+                                        // TODO Create new stage
+                                        var_dump('create stage');
+                                    }
+                                    */
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Go to next/previous step
+                // Go to next/previous step
+                if($validation === true)
+                {
+                    if(!is_null($this->request->getPostParam('prev'))) {
+                        $step--;
+                    }
+                    else {
+                        $step++;
+                    }
+                    if($step > $steps) {
+                        // TODO Redirect
+                        //$this->redirect($this->linker->link(array('quest', $seminary['url'], $questgroup['url'], $quest['url']), 1));
+                    }
+                }
+            }
+
+            // Get validation settings
+            $validationSettings = array();
+            foreach($fields as &$field) {
+                $validationSettings[$field] = $this->validationSettings[$field];
+            }
 
 
             // Pass data to view
             $this->set('seminary', $seminary);
+            $this->set('character', $character);
             $this->set('fight', $fight);
-            $this->set('stages', $stage);
-            //print_r($stage);
+            $this->set('step', $step);
+            $this->set('tree', $tree);
+            $this->set('bossname', $bossname);
+            $this->set('livesCharacter', $livesCharacter);
+            $this->set('livesBoss', $livesBoss);
+            $this->set('mimetypes', $mimetypes);
+            $this->set('validation', $validation);
+            $this->set('validationSettings', $validationSettings);
         }
 
 
@@ -287,6 +484,118 @@
             return $childStages;
         }
 
+
+        private function createStageTree($livesCharacter, $livesBoss)
+        {
+            $c = max($livesCharacter, $livesBoss) * 2;
+            $tree = array();
+
+            $tree[0] = array(
+                array(
+                    'lives_character'   => $livesCharacter,
+                    'lives_boss'        => $livesBoss
+                )
+            );
+            for($i=1; $i<$c; $i++ )
+            {
+                $treeitem = array();
+                $n = pow(2, $i);
+                for($j=0; $j<$n/2; $j++)
+                {
+                    if(array_key_exists($j, $tree[$i-1]))
+                    {
+                        if($tree[$i-1][$j]['lives_character'] > 0 && $tree[$i-1][$j]['lives_boss'] > 0 && $tree[$i-1][$j]['lives_boss'] - 1 >= 0)
+                        {
+                            $treeitem[$j*2] = array(
+                                'lives_character'   => $tree[$i-1][$j]['lives_character'],
+                                'lives_boss'        => $tree[$i-1][$j]['lives_boss'] - 1,
+                            );
+                        }
+                        if($tree[$i-1][$j]['lives_character'] > 0 && $tree[$i-1][$j]['lives_boss'] > 0 && $tree[$i-1][$j]['lives_character'] - 1 >= 0)
+                        {
+                            $treeitem[$j*2+1] = array(
+                                'lives_character'   => $tree[$i-1][$j]['lives_character'] - 1,
+                                'lives_boss'        => $tree[$i-1][$j]['lives_boss'],
+                            );
+                        }
+                    }
+                }
+
+                $tree[] = $treeitem;
+            }
+
+
+            return $tree;
+        }
+
+
+        private function createStageTree2($questId, $livesCharacter, $livesBoss)
+        {
+            // Create tree root
+            $tree = array();
+            $tree[0] = array(
+                'lives_character'   => $livesCharacter,
+                'lives_boss'        => $livesBoss
+            );
+
+            // Get first stage
+            $stage = $this->Bossfight->getFirstStage($questId);
+            $tree[0]['stage'] = $stage;
+
+            // Start recursion
+            $this->createStageTreeRec($questId, $stage, $tree);
+
+
+            // Return tree
+            return $tree;
+        }
+
+
+        private function createStageTreeRec($questId, $stage, &$tree)
+        {
+            // Get child stages
+            $childStages = $this->Bossfight->getChildStages($stage['id']);
+            foreach($childStages as $childStage)
+            {
+                $this->createStageTreeRec($questId, $childStage, $tree);
+            }
+        }
+
+
+        private function attachStages($questId, &$tree)
+        {
+            foreach($tree as $i => &$v)
+            {
+                if($i == 0) {
+                    $v[0]['stage'] = $this->Bossfight->getFirstStage($questId);
+                }
+                else
+                {
+                    $childStages = null;
+                    foreach($v as $j => &$h)
+                    {
+                        if(is_null($childStages))
+                        {
+                            $childStages = range(0, 1);
+                            if(array_key_exists('stage', $tree[$i-1][floor($j/2)]) && !empty($tree[$i-1][floor($j/2)]['stage']))
+                            {
+                                $stages = $this->Bossfight->getChildStages($tree[$i-1][floor($j/2)]['stage']['id']);
+                                if(!empty($stages)) {
+                                    $childStages = $stages;
+                                }
+                            }
+                            $tree[$i-1][floor($j/2)]['childstages'] = $childStages;
+                            $h['stage'] = (count($childStages) > 0) ? $childStages[0] : array();
+                        }
+                        else {
+                            $h['stage'] = (count($childStages) > 1) ? $childStages[1] : array();
+                            $childStages = null;
+                        }
+                    }
+                }
+            }
+        }
+
     }
 
 ?>
diff --git a/questtypes/bossfight/BossfightQuesttypeModel.inc b/questtypes/bossfight/BossfightQuesttypeModel.inc
index 36efafa7..3bac737a 100644
--- a/questtypes/bossfight/BossfightQuesttypeModel.inc
+++ b/questtypes/bossfight/BossfightQuesttypeModel.inc
@@ -91,6 +91,35 @@
         }
 
 
+        public function createBossFight($userId, $questId, $bossname, $bossmediaId, $livesCharacter, $livesBoss)
+        {
+            $this->db->query(
+                'INSERT INTO questtypes_bossfight '.
+                '(quest_id, created_user_id, bossname, boss_seminarymedia_id, lives_character, lives_boss) '.
+                'VALUES '.
+                '(?, ?, ?, ?, ?, ?)',
+                'iisiii',
+                $questId, $userId, $bossname, $bossmediaId, $livesCharacter, $livesBoss
+            );
+
+
+            return $this->db->getInsertId();
+        }
+
+
+        public function editBossFight($questId, $bossname, $bossmediaId, $livesCharacter, $livesBoss)
+        {
+            $this->db->query(
+                'UPDATE questtypes_bossfight '.
+                'SET bossname = ?, boss_seminarymedia_id = ?, lives_character = ?, lives_boss = ? '.
+                'WHERE quest_id = ?',
+                'siiii',
+                $bossname, $bossmediaId, $livesCharacter, $livesBoss,
+                $questId
+            );
+        }
+
+
         /**
          * Get the first Stage to begin the Boss-Fight with.
          *
diff --git a/questtypes/bossfight/html/edittask.tpl b/questtypes/bossfight/html/edittask.tpl
index ca85d900..f63c53ee 100644
--- a/questtypes/bossfight/html/edittask.tpl
+++ b/questtypes/bossfight/html/edittask.tpl
@@ -1,41 +1,201 @@
+<?php if($validation !== true && !empty($validation)) : ?>
+<ul class="validation">
+    <?php foreach($validation as $field => &$settings) : ?>
+    <li>
+        <ul>
+            <?php foreach($settings as $setting => $value) : ?>
+            <li>
+                <?php switch($field) {
+                    case 'bossname':
+                        switch($setting) {
+                            case 'minlength': printf(_('Name is too short (min. %d chars)'), $value);
+                            break;
+                            case 'maxlength': printf(_('Name is too long (max. %d chars)'), $value);
+                            break;
+                            case 'regex': echo _('Name contains illegal characters');
+                            break;
+                            default: echo _('Name invalid');
+                        }
+                    break;
+                    case 'bossimage':
+                        switch($setting) {
+                            case 'error': printf(_('Error during file upload: %s'), $value);
+                            break;
+                            case 'mimetype': printf(_('File has wrong type “%s”'), $value);
+                            break;
+                            case 'size': echo _('File exceeds size maximum');
+                            break;
+                            default: echo _('File invalid');
+                        }
+                    break;
+                } ?>
+            </li>
+            <?php endforeach ?>
+        </ul>
+    </li>
+    <?php endforeach ?>
+</ul>
+<?php endif ?>
 <form method="post" enctype="multipart/form-data">
+    <?php if($step == 0) : ?>
     <fieldset>
-        <legend><?=_('Boss-Fight')?></legend>
+        <legend><?=sprintf(_('Step %d'), 1)?>: <?=_('Boss-Fight')?></legend>
         <label><?=_('Boss name')?></label>
-        <input type="text" name="bossname" value="<?=$fight['bossname']?>" /><br />
+        <input type="text" name="bossname" value="<?=$bossname?>" maxlength="<?=$validationSettings['bossname']['maxlength']?>" <?=($validation !== true && array_key_exists('bossname', $validation)) ? 'class="invalid"' : null ?> /><br />
         <label><?=_('Boss image')?></label>
         <input type="file" name="bossimage" /><br />
-        <label><?=_('Boss lives')?></label>
-        <input type="number" name="lives_boss" value="<?=$fight['lives_boss']?>" /><br />
+        <p><?=_('Allowed file types')?>:</p>
+        <ul>
+            <?php foreach($mimetypes as &$mimetype) : ?>
+            <li><?=sprintf(_('%s-files'), strtoupper(explode('/',$mimetype['mimetype'])[1]))?> <?php if($mimetype['size'] > 0) : ?>(<?=_('max.')?> <?=round($mimetype['size']/(1024*1024),2)?> MiB)<?php endif ?></li>
+            <?php endforeach ?>
+        </ul>
         <label><?=_('Character lives')?></label>
-        <input type="number" name="lives_character" value="<?=$fight['lives_character']?>" />
+        <input type="number" name="lives_character" value="<?=$livesCharacter?>" <?=($validation !== true && array_key_exists('lives_character', $validation)) ? 'class="invalid"' : null ?> /><br />
+        <label><?=_('Boss lives')?></label>
+        <input type="number" name="lives_boss" value="<?=$livesBoss?>" <?=($validation !== true && array_key_exists('lives_boss', $validation)) ? 'class="invalid"' : null ?> />
     </fieldset>
-    <fieldset>
-        <legend><?=_('Stages')?></legend>
-        <?php renderStage($stages, $fight['lives_boss'], $fight['lives_character']); ?>
+    <input type="submit" name="next" value="<?=_('next step')?>" />
+    <?php elseif($step == 1) : ?>
+    <fieldset id="bosstree">
+        <legend><?=sprintf(_('Step %d'), 2)?>: <?=_('Stages')?></legend>
+        <?php foreach($tree as $i => $v) : ?>
+        <div class="bosstreerow">
+            <?php foreach($v as $j => $h) : ?>
+            <div id="bti-<?=$i?>-<?=$j?>" class="bosstreeitem" style=" width:<?=sprintf('%.3F', 100/count($v))?>%">
+                <span class="bosstreelabel">
+                    <?php if($h['lives_character'] > 0) : ?>
+                    <?php foreach(range(1,$h['lives_character']) as $l) : ?>
+                    <i class="fa fa-heart fa-fw char"></i>
+                    <?php endforeach ?>
+                    <?php endif ?>
+                    <?php if($h['lives_boss'] > 0) : ?>
+                    <?php foreach(range(1,$h['lives_boss']) as $l) : ?>
+                    <i class="fa fa-heart fa-fw boss"></i>
+                    <?php endforeach ?>
+                    <?php endif ?>
+                </span>
+                <div id="line-<?=$i?>-<?=$j?>" class="bosstreeline"></div>
+            </div>
+            <?php endforeach ?>
+        </div>
+        <?php endforeach ?>
     </fieldset>
-    <input type="submit" name="save" value="<?=_('save')?>" />
+    <fieldset id="stages">
+        <legend><?=_('Selected stage')?></legend>
+        <?php foreach($tree as $i => $v) : ?>
+        <?php foreach($v as $j => $h) : ?>
+        <div id="stage-<?=$i?>-<?=$j?>" class="bossstage">
+            <div class="cf">
+                <section class="opponent">
+                    <p class="fwb"><?=$character['name']?></p>
+                    <p class="portrait"><img src="<?=$linker->link(array('media','avatar',$seminary['url'],$character['charactertype_url'],$character['xplevel']))?>" class="hero" /></p>
+                    <p>
+                        <?php if($h['lives_character'] > 0) : ?>
+                        <?php foreach(range(1,$h['lives_character']) as $l) : ?>
+                        <i class="fa fa-heart fa-fw char"></i>
+                        <?php endforeach ?>
+                        <?php else : ?>
+                        <?=_('lost')?>
+                        <?php endif ?>
+                    </p>
+                </section>
+                <section class="opponent">
+                    <p class="fwb"><?=$fight['bossname']?></p>
+                    <p class="portrait"><img src="<?=$linker->link(array('media','seminary',$seminary['url'],$fight['bossmedia']['url']))?>" class="boss" /></p>
+                    <p>
+                        <?php if($h['lives_boss'] > 0) : ?>
+                        <?php foreach(range(1,$h['lives_boss']) as $l) : ?>
+                        <i class="fa fa-heart fa-fw boss"></i>
+                        <?php endforeach ?>
+                        <?php else : ?>
+                        <b><?=_('lost')?></b>
+                        <?php endif ?>
+                    </p>
+                </section>
+            </div>
+            <textarea name="stages[<?=$i?>][<?=$j?>][question]"><?=$h['stage']['text']?></textarea>
+            <?php if(array_key_exists('childstages', $h)) : ?>
+            <ul class="bossfight cf">
+                <?php foreach($h['childstages'] as &$childStage) : ?>
+                <li class="option">
+                    <textarea name="stages[<?=$i?>][<?=$j?>]"><?php if(!empty($childStage)) : ?><?=\hhu\z\Utils::t($childStage['question'])?><?php endif ?></textarea>
+                </li>
+                <?php endforeach ?>
+            </ul>
+            <?php endif ?>
+        </div>
+        <?php endforeach ?>
+        <?php endforeach ?>
+    </fieldset>
+    <input type="submit" name="prev" value="<?=_('previous step')?>" />
+    <input type="submit" name="next" value="<?=_('save')?>" />
+    <input type="hidden" name="step" value="<?=$step?>" />
+    <?php endif ?>
 </form>
 
-<?php function renderStage($stage, $livesBoss, $livesCharacter, $level=0, $indices=array()) { ?>
-    <div style="margin-left:<?=$level?>em">
-        <h2><?=implode('.', $indices)?></h2>
-        <?php if(!empty($stage['question'])) : ?>
-        <p><?=$stage['question']?></p>
+<script>
+    function drawLine(targetItemId, sourceItemId, lineId)
+    {
+        var sourceItem = $('#'+sourceItemId);
+        var targetItem = $('#'+targetItemId);
+        var sourcePoint = sourceItem.position();
+        sourcePoint.left = sourcePoint.left + sourceItem.width()/2;
+        sourcePoint.top = sourcePoint.top + sourceItem.height();
+        var targetPoint = targetItem.position();
+        targetPoint.left = targetPoint.left + targetItem.width()/2;
+        var line = $('#'+lineId);
+
+        var length = Math.sqrt(
+            Math.pow(targetPoint.left - sourcePoint.left, 2) +
+            Math.pow(targetPoint.top - sourcePoint.top, 2)
+        );
+        var angle = 180 / Math.PI * Math.acos((targetPoint.left - sourcePoint.left) / length);
+
+        line.css('width', Math.floor(length)+'px');
+        line.css('left', sourcePoint.left+'px');
+        line.css('top', sourcePoint.top+'px');
+        line.css('transform-origin', 'top left');
+        line.css('transform', 'rotate('+angle+'deg)');
+    }
+
+    function drawLines()
+    {
+        <?php foreach($tree as $i => $v) : ?>
+        <?php foreach($v as $j => $h) : ?>
+        <?php if($i > 0) : ?>
+        drawLine('bti-<?=$i?>-<?=$j?>', 'bti-<?=$i-1?>-<?=floor($j/2)?>', 'line-<?=$i?>-<?=$j?>');
         <?php endif ?>
-        <p><?=_('Character')?> <?=$livesCharacter?> vs. <?=$livesBoss?> <?=_('Boss')?></p>
-        <p><?=$stage['text']?></p>
-        <?php foreach($stage['childs'] as $index => &$childStage) : ?>
-            <?php $childIndices = $indices; ?>
-            <?php $childIndices[] = $index+1; ?>
-            <?php renderStage($childStage, $livesBoss+$childStage['livedrain_boss'], $livesCharacter+$childStage['livedrain_character'], $level+1, $childIndices); ?>
         <?php endforeach ?>
-        <?php if($livesBoss == 0 && $livesCharacter == 0) : ?>
-        Bedie verloren
-        <?php elseif($livesBoss == 0) : ?>
-        Boss verloren, Character gewonnen
-        <?php elseif($livesCharacter == 0) : ?>
-        Boss gewonnen, Character verloren
-        <?php endif ?>
-    </div>
-<?php } ?>
+        <?php endforeach ?>
+    }
+
+    function showSelectedStage()
+    {
+        $("#bosstree span.ui-selected").each(function(index) {
+            var id = 'stage-' + $(this).parent().attr('id').substr(4);
+            // hide current stage
+            $("#stages div.bossstage").css('display', 'none');
+            // show new stage
+            $("#"+id).css('display', 'block');
+        });
+    }
+
+    var resizeTimer;
+    $(function()
+    {
+        $(window).resize(function() {
+            clearTimeout(resizeTimer);
+            resizeTimer = setTimeout(drawLines, 100);
+        });
+        drawLines();
+        $('#bosstree').selectable({
+            filter: " span.bosstreelabel",
+            selected: function(event, ui) {
+                showSelectedStage();
+            }
+        });
+        $("#bti-0-0 span.bosstreelabel").addClass('ui-selected');
+        showSelectedStage();
+    });
+</script>