Adding types to everything in the most sane way possible