Did some refactoring.
Numbers up to 20 are now handled.