.. not working anymore. why?
Some cleanup.
Playing around -  not properly working yet.