Rewriting Start and End method to allow local play
adding a todo