Story/65/alex

This attacks #65 (finally)