all but timing and comments basically done I think