Cleaned up and established three way binding