Working alternative
Revert "Working alternative"

This reverts commit ef9151d2a71e02898335e0fb6ec9e0d5416e92af.
Revert "Revert "Working alternative""

This reverts commit 57c1c7d3e288afc8ffdf94a3fc297e066a67c4d7.
Cleaned up solution working on mac