Continuing to work with Hibernate.
Started client side refactoring.