Started adding type checks