added password protections
merge notes and login