Add a few planned features so i dont forget