Work on domain class to model domains - For perms and UX improvements
Fixed conflicts