Commit before branching

Go back here if we fuck up.