Added Users to the mwb file

Also work-in-progress contact editor