Refactor typer to allow for gamboge.
Hacked things together. They ain't workin'