Added enum handling and corrected names
Added enum and corrected names
Started work on Player view