some cleanup of untyped, i don't really feel like breaking it out into separate modules, I will for the next one