Need to Finish

Correct Database name, Finish Query, Test functionality