started moving functions to helpers in client
beginning more tag fixes