some moving/merging between samba and users (WIP)