OOP-ed, refactored, and now queries for password