Add and Edit states now working pretty well.