Some new TODO's | Thanks to @maxheering