removed some code and reworked a bit...

more to come...