1. Somewhat working but there are still issues when rebuilding the form