I'm working on it, no problem, big changes needs big review, completly with you on that. Future commits coming soon.