Added TODO comments and external .jar for build path