Progress on #19...

But to test, I think I need to work on #15, due to my local config
Also close #15