Phase-2

Database working