Committing everything, hope it works