More work towards the basic td