Working on database part + test tool