refectorings before we wire in more functionality