Final commit to salsa

We finished