Insert/Update; validations/polish pending