Adding some functions and TODO