Rewrote the DataCollection part

adapted to use without any framework - still needs some improvements