Model done, improving editor now