Some more work, as usual, too many to list.
Well, time to start on the permissions module! (soon)