Initial commit got it working