consolified, added pms, broke usernames