Revert "Revert "More cool stuff""

This reverts commit 6891c1cf520306a71a3e9cb6543cb00ff7115854.