Continue working on refactor/popform