#51 Restructure handlers to be a map of functions and constants