worked out some more stuff, still need to do password changes/resets