Feature/work on domains

Merge to master.