Added TODO, added sudo check