Done!
For anyone following and interested in this. Moved this part of discussion over to this thread.