Made todos to look into hashmaps