Wrapper

@adgad @commuterjoy 

As well as code review would be good if one of you could try a fresh install of the app