Forgive me if I'm wrong but isn't house #1 only CGT free up until 2008 when you bought another PPOR? You can only have one PPOR so it would have been CGT free when you were living in it and when you were renting but when you bought your house #2 and moved in it will attract CGT from then onwards
