Some changes... bridge pattern turned out to be strategy one...