Removed from TODO what is now implemented