Hook things up correctly