Form Updates / Needs Refactoring