Finilised the migration to player elements. Also started work on the model