Initial work on btnAdd for PBPW