Some new Todos | Thanks to @maxheering