Me trying to add more features and fix current stuff