turning basically working with one bug to be fixed