Initial Refactor of 'Social' Class