Further rework towards a functioning soltuion