Tiny feature that needs to become a bigger feature soon