indent
more model stuff
fixed merge conflicts
saving works
single user possible