Started moving to a more sane client structure