Mayor updates to script

Re-think user login and application structure