Began adding jpa functionality