re-wrote for specifically oo, added in password again