c-c-c-c-changes

- cleaned
- modularized
- not entirely random anymore (!?!?) 

Let's look at this together if possible... 

~ J