As stated and I'm working on some other things while doing this so I'll post back here later the changes and updates. 

Thank you