Edit Fields now working, will persist data