Added todo list, updated toolbox