Yes I will merge this with my version and move all member variables together at the top