Merging some progress with #3 and installation