Namespacing forms needs to happen, but needs to be a feature branch and done more sanely