dasd
MERGED
first wokring prototype