Initial commit and isolation