starting to migrate shortcuts into a handler