First commit

all working