Think I have it working but can't test yet.