Start over with constraints
Updated gitignore