Added a to do list to support functions