#63 added final to lots of member data, grouped final data together