Final commit Working game