Edit now working DB implementation