Done and done. I'll continue it in PM ASAP