Started adding judgements and types