Full commit

Everything