lots of refactoring again , implemented hibernate