Commit after holiday to get this back on my main computer