We're committing

Moved a ton of stuff around but it doesn't work yet