Managed to add a few more features