To Do : Fixing and Implementing IEnumerable