Made code more foolrpofo by moving add to list kode to base class