Create/Edit logic with validation etc, mostly working...