Adding TODOs
Cleaned up Player files