first commit
add comments to handlers
merge origin