WIP
refactored + showing resutls