Cleaned out some dead code and made some refactorings
We have a working game!!!