Did some further testing, needs more work but it is looking good so far