Add to New Project pg, refactor