Dyktus branch

Done.