POM changes
pom changes
Integrated some database classes from Ward