major refactor, spring/hibernate may actually be intergrating properly now