Working commit
Update the helper class
Clean up helper
Put contact helper in sync with other branch