Move more into coils framework