Start doing handle-based stuff in map