I'll work on it...and hopefully post v2 later.