Milestone 1
M1 achieved
refined sql queries