Working on more features! Feel free to give any feedback