Adding basic functionality to it. First trys.