Re-arrange. TODO's are now in roughly priority order.