running end to end, but doesn't authenticate. edits by tom