Removed useless functions, working on implementing add/play