Moved handler registration out of Setup, we'd like it eventually to be dynamic.