Final commit, everything working as should.