Encapsulate most of the things.
UI changes
New Contact Listener code