working kindof well
updated for spring data