Redo Hibernate call and 1st pass at concept refactor.