Minor refactor
Add results. Minor API update