Fixed Database.  Added EditChild logic