All done btw, I've even added resources file already. It's time to merge