Revert "Revert "Getting close :D""

This reverts commit b8faa2eae303d4650d42c14cdcccaadb992e8cae.