Final Commit: Might be the pre final one if i want to add more features