Much better solution uploaded - its AWESOME