Initial commit from STS on macbook