first commit
updated and working