history: My friend has been couch surfing for a few weeks. He has been getting under my skin.
current: My friend has been on the couch for a few weeks. He is getting under my skin now.
next: What happened to him? Are you guys roommates?