Moved members into it's own template