Added 3 more TODOs :P