Continued work on linking database