Continue working on the Pop\Form refactor