Game COmplete..

- Refactor
- Test suite