todo: convert into a feature wishlist