Added features and todo