Moved everything out of handlers
Moved everything out of handlers