Almost finished - just getting some problems to set new vars after submit