todo comments
added event handlers
reversion