Add Flush handling abd other items in TODO list
Also remove shutdown which has been added