fixing handlers and main
Merging main and handlers