@Mohanad Mohamed - I'll try and review your pull requests before you get up, please poke me if I miss any