Feature/resolution+other methods

JPA some new shiny this =)