Some welcome work and a contact dialog thing WIP