Making the typing thing prettier...slowly