refactor + user rights
refactor everything
merge