work in progress removing hibernate
work in progress removing hibernate