[@ Holy Soldier]

Done and done. Please see above, and let me know if I need to edit!!