Added todo functions