database linked

Indika merge now!!