Re-organize things to make this all more logical
Ensure we send the right things