reckon you can fix these TODO while you're here?