Added the idea of handlers
Resolved conflicts