nearly there

2 more bits todo