Done! Just need to add functional programming to functions