Change from hard code to OOP (retrive...)