[@Pundii] Looks good, throw it over to the CS tab.

[@vFear] Looking good so far. ^^