Feature/dialer2.1

Two setUp methods? Wat??