Final commit

Everything working just fine! =D