Added TODOs and learning how to pull into eclipse