Commiting what I did on my laptop, don't know how much of this works.