Continue heavy re-factoring of Player module