Huge refactor applied, awesome OOP has taken over the crown. Checkout the two puzzles