Re-shuffled database, replies kinda work!

Signed-off-by: Fraser Sharp <fzsharp@dundee.ac.uk>