Switching to EBean ORM. In progress...