First really working initial commit from my machine