Did Tommy have a crush on Carrie ?

Tommy gets to know Carrie, he realizes that she is very different to what he expected and he finds he has an attraction towards her. However, he dies from his wounds as a result if a prank towards Carrie on the prom night.