JPA working...still some things to fix