code review

This should be more high level. There is no retry logic and stuff like that in here