now working as expected. (+2 squashed commits)
Squashed commits:
[7528ac8] betta
[2195ddc] refactor