green test but problem with event args
fixed
refactoring completed
fixed web app
added TODO