Re factored and some functionality to the typewriter system.