first stuff
fixed automerge conflict
more work towards almost done
ready for first test
drazi complete