Final commit before I move to linux

Wish me luck.