Updated Current Features and TODO