todo items for 2.3 and 5