initial commit
all sorts of adjustments