[@Kal-El]

Make a CS and I'll take a look. Sounds good.