ETDRK struct 'almost' finished