Altered player lifecycle to fit new format
merge