full working version :-)
 housekeeping and Documentation
 added TODO