fist commit
tidy up