Added TODO comments and readded unstable feature