Version 2 Appears to be working (Not tested).
Signed-off-by:JBerkvens <MP.Berkvens@Gmail.com>