about to pull
added back commented-out code
got user logins working
merged with master and fixmodels branches