Added PW placeholders
Work in progress