Reorder function defs to placate my OCD
Account edit/password page; start work on survey library