pretty sure the one you are looking for is one of these 4 stories (http://del.icio.us/place4mystuff/Makepeace) with my Makepeace tag. Let me know if it is not because I think there are several where Makepeace's obsession with Daniel leads to shower assaults, as evidenced by the fact that Makepeace has his own tag in my del.icio.us!! Poor Daniel