merged
merging with master
mostly finished