Added TODO tag next to areas that need to be completed