Ugly quick fix

In reality, I probably should have converted everything or numbers
right away instead of toying with AKQJ throughout or worked with enums
instead of doing dicts at the start.