initial buggy jpa changes

Signed-off-by: Lyndon Michael Bibera <secret.transaction@gmail.com>