first commit
Initial setup
initial setup
some fixes
conflict resolved